Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 28 Jan 2010 00:06:29 +0000 (00:06 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 28 Jan 2010 00:06:29 +0000 (00:06 +0000)

Trivial merge